From 57237d4d89da7fd73d7011469256479da1886cb0 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Sun, 27 May 2001 21:43:09 +0000 Subject: [PATCH] Rename to the more correct gtk-go-up. 2001-05-27 Alexander Larsson * gtk/gtkstock.h (GTK_STOCK_GO_UP): Rename to the more correct gtk-go-up. * gtk/stock-icons/stock_menu_sort_ascending.png: Added new file. * gtk/stock-icons/stock_menu_sort_descending.png: Changed to show descending instead of ascending. * gtk/gtkiconfactory.c: Added menu size icon to sort ascending. * gtk/stock-icons/Makefile.am: Added stock_menu_sort_ascending.png. * gtk/gtkseparatormenuitem.c: Use correct typenames. --- ChangeLog | 20 ++++++++++++++++++ ChangeLog.pre-2-0 | 20 ++++++++++++++++++ ChangeLog.pre-2-10 | 20 ++++++++++++++++++ ChangeLog.pre-2-2 | 20 ++++++++++++++++++ ChangeLog.pre-2-4 | 20 ++++++++++++++++++ ChangeLog.pre-2-6 | 20 ++++++++++++++++++ ChangeLog.pre-2-8 | 20 ++++++++++++++++++ gtk/gtkiconfactory.c | 10 +++++++-- gtk/gtkseparatormenuitem.c | 4 ++-- gtk/gtkstock.h | 2 +- gtk/stock-icons/Makefile.am | 2 ++ gtk/stock-icons/stock_menu_sort_ascending.png | Bin 0 -> 302 bytes .../stock_menu_sort_descending.png | Bin 302 -> 296 bytes gtk/stock-icons/stock_sort_ascending_16.png | Bin 0 -> 302 bytes gtk/stock-icons/stock_sort_descending_16.png | Bin 302 -> 296 bytes 15 files changed, 153 insertions(+), 5 deletions(-) create mode 100644 gtk/stock-icons/stock_menu_sort_ascending.png create mode 100644 gtk/stock-icons/stock_sort_ascending_16.png diff --git a/ChangeLog b/ChangeLog index 7656dd9b95..1f4e579bf3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +2001-05-27 Alexander Larsson + + * gtk/gtkstock.h (GTK_STOCK_GO_UP): + Rename to the more correct gtk-go-up. + + * gtk/stock-icons/stock_menu_sort_ascending.png: + Added new file. + + * gtk/stock-icons/stock_menu_sort_descending.png: + Changed to show descending instead of ascending. + + * gtk/gtkiconfactory.c: + Added menu size icon to sort ascending. + + * gtk/stock-icons/Makefile.am: + Added stock_menu_sort_ascending.png. + + * gtk/gtkseparatormenuitem.c: + Use correct typenames. + Sun May 20 20:07:35 2001 Tim Janik * gtk/gtksignal.[hc] (gtk_signal_connect_full): make hanlder id a diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 7656dd9b95..1f4e579bf3 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,23 @@ +2001-05-27 Alexander Larsson + + * gtk/gtkstock.h (GTK_STOCK_GO_UP): + Rename to the more correct gtk-go-up. + + * gtk/stock-icons/stock_menu_sort_ascending.png: + Added new file. + + * gtk/stock-icons/stock_menu_sort_descending.png: + Changed to show descending instead of ascending. + + * gtk/gtkiconfactory.c: + Added menu size icon to sort ascending. + + * gtk/stock-icons/Makefile.am: + Added stock_menu_sort_ascending.png. + + * gtk/gtkseparatormenuitem.c: + Use correct typenames. + Sun May 20 20:07:35 2001 Tim Janik * gtk/gtksignal.[hc] (gtk_signal_connect_full): make hanlder id a diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 7656dd9b95..1f4e579bf3 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,23 @@ +2001-05-27 Alexander Larsson + + * gtk/gtkstock.h (GTK_STOCK_GO_UP): + Rename to the more correct gtk-go-up. + + * gtk/stock-icons/stock_menu_sort_ascending.png: + Added new file. + + * gtk/stock-icons/stock_menu_sort_descending.png: + Changed to show descending instead of ascending. + + * gtk/gtkiconfactory.c: + Added menu size icon to sort ascending. + + * gtk/stock-icons/Makefile.am: + Added stock_menu_sort_ascending.png. + + * gtk/gtkseparatormenuitem.c: + Use correct typenames. + Sun May 20 20:07:35 2001 Tim Janik * gtk/gtksignal.[hc] (gtk_signal_connect_full): make hanlder id a diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 7656dd9b95..1f4e579bf3 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,23 @@ +2001-05-27 Alexander Larsson + + * gtk/gtkstock.h (GTK_STOCK_GO_UP): + Rename to the more correct gtk-go-up. + + * gtk/stock-icons/stock_menu_sort_ascending.png: + Added new file. + + * gtk/stock-icons/stock_menu_sort_descending.png: + Changed to show descending instead of ascending. + + * gtk/gtkiconfactory.c: + Added menu size icon to sort ascending. + + * gtk/stock-icons/Makefile.am: + Added stock_menu_sort_ascending.png. + + * gtk/gtkseparatormenuitem.c: + Use correct typenames. + Sun May 20 20:07:35 2001 Tim Janik * gtk/gtksignal.[hc] (gtk_signal_connect_full): make hanlder id a diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 7656dd9b95..1f4e579bf3 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,23 @@ +2001-05-27 Alexander Larsson + + * gtk/gtkstock.h (GTK_STOCK_GO_UP): + Rename to the more correct gtk-go-up. + + * gtk/stock-icons/stock_menu_sort_ascending.png: + Added new file. + + * gtk/stock-icons/stock_menu_sort_descending.png: + Changed to show descending instead of ascending. + + * gtk/gtkiconfactory.c: + Added menu size icon to sort ascending. + + * gtk/stock-icons/Makefile.am: + Added stock_menu_sort_ascending.png. + + * gtk/gtkseparatormenuitem.c: + Use correct typenames. + Sun May 20 20:07:35 2001 Tim Janik * gtk/gtksignal.[hc] (gtk_signal_connect_full): make hanlder id a diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 7656dd9b95..1f4e579bf3 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,23 @@ +2001-05-27 Alexander Larsson + + * gtk/gtkstock.h (GTK_STOCK_GO_UP): + Rename to the more correct gtk-go-up. + + * gtk/stock-icons/stock_menu_sort_ascending.png: + Added new file. + + * gtk/stock-icons/stock_menu_sort_descending.png: + Changed to show descending instead of ascending. + + * gtk/gtkiconfactory.c: + Added menu size icon to sort ascending. + + * gtk/stock-icons/Makefile.am: + Added stock_menu_sort_ascending.png. + + * gtk/gtkseparatormenuitem.c: + Use correct typenames. + Sun May 20 20:07:35 2001 Tim Janik * gtk/gtksignal.[hc] (gtk_signal_connect_full): make hanlder id a diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 7656dd9b95..1f4e579bf3 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,23 @@ +2001-05-27 Alexander Larsson + + * gtk/gtkstock.h (GTK_STOCK_GO_UP): + Rename to the more correct gtk-go-up. + + * gtk/stock-icons/stock_menu_sort_ascending.png: + Added new file. + + * gtk/stock-icons/stock_menu_sort_descending.png: + Changed to show descending instead of ascending. + + * gtk/gtkiconfactory.c: + Added menu size icon to sort ascending. + + * gtk/stock-icons/Makefile.am: + Added stock_menu_sort_ascending.png. + + * gtk/gtkseparatormenuitem.c: + Use correct typenames. + Sun May 20 20:07:35 2001 Tim Janik * gtk/gtksignal.[hc] (gtk_signal_connect_full): make hanlder id a diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c index 35ce60f203..f4d025a041 100644 --- a/gtk/gtkiconfactory.c +++ b/gtk/gtkiconfactory.c @@ -489,7 +489,14 @@ get_default_icons (GtkIconFactory *factory) GTK_ICON_SIZE_MENU, GTK_STOCK_SORT_DESCENDING); - /* Generic size only */ + + add_sized_with_fallback (factory, + stock_sort_ascending, + stock_menu_sort_ascending, + GTK_ICON_SIZE_MENU, + GTK_STOCK_SORT_ASCENDING); + +/* Generic size only */ add_unsized (factory, stock_add, GTK_STOCK_ADD); add_unsized (factory, stock_align_center, GTK_STOCK_JUSTIFY_CENTER); @@ -530,7 +537,6 @@ get_default_icons (GtkIconFactory *factory) add_unsized (factory, stock_save_as, GTK_STOCK_SAVE_AS); add_unsized (factory, stock_search, GTK_STOCK_FIND); add_unsized (factory, stock_search_replace, GTK_STOCK_FIND_AND_REPLACE); - add_unsized (factory, stock_sort_ascending, GTK_STOCK_SORT_ASCENDING); add_unsized (factory, stock_spellcheck, GTK_STOCK_SPELL_CHECK); add_unsized (factory, stock_stop, GTK_STOCK_STOP); add_unsized (factory, stock_text_bold, GTK_STOCK_BOLD); diff --git a/gtk/gtkseparatormenuitem.c b/gtk/gtkseparatormenuitem.c index 43437c4bcf..77b6b06d20 100644 --- a/gtk/gtkseparatormenuitem.c +++ b/gtk/gtkseparatormenuitem.c @@ -39,13 +39,13 @@ gtk_separator_menu_item_get_type (void) { static const GTypeInfo separator_menu_item_info = { - sizeof (GtkMenuItemClass), + sizeof (GtkSeparatorMenuItemClass), NULL, /* base_init */ NULL, /* base_finalize */ (GClassInitFunc) gtk_separator_menu_item_class_init, NULL, /* class_finalize */ NULL, /* class_data */ - sizeof (GtkMenuItem), + sizeof (GtkSeparatorMenuItem), 16, /* n_preallocs */ (GInstanceInitFunc) NULL, }; diff --git a/gtk/gtkstock.h b/gtk/gtkstock.h index 9ca91aab04..c870bbbb77 100644 --- a/gtk/gtkstock.h +++ b/gtk/gtkstock.h @@ -89,7 +89,7 @@ void gtk_stock_item_free (GtkStockItem *item); #define GTK_STOCK_GO_BACK "gtk-go-back" #define GTK_STOCK_GO_DOWN "gtk-go-down" #define GTK_STOCK_GO_FORWARD "gtk-go-forward" -#define GTK_STOCK_GO_UP "gtk-up" +#define GTK_STOCK_GO_UP "gtk-go-up" #define GTK_STOCK_HELP "gtk-help" #define GTK_STOCK_HOME "gtk-home" #define GTK_STOCK_INDEX "gtk-index" diff --git a/gtk/stock-icons/Makefile.am b/gtk/stock-icons/Makefile.am index 29d5b6e2cf..eac408bce1 100644 --- a/gtk/stock-icons/Makefile.am +++ b/gtk/stock-icons/Makefile.am @@ -37,6 +37,7 @@ IMAGES = @STRIP_BEGIN@ \ stock_last.png \ stock_left_arrow.png \ stock_menu_print_preview.png \ + stock_menu_sort_ascending.png \ stock_menu_sort_descending.png \ stock_new.png \ stock_open.png \ @@ -109,6 +110,7 @@ VARIABLES = @STRIP_BEGIN@ \ stock_last $(srcdir)/stock_last.png \ stock_left_arrow $(srcdir)/stock_left_arrow.png \ stock_menu_print_preview $(srcdir)/stock_menu_print_preview.png \ + stock_menu_sort_ascending $(srcdir)/stock_menu_sort_ascending.png \ stock_menu_sort_descending $(srcdir)/stock_menu_sort_descending.png \ stock_new $(srcdir)/stock_new.png \ stock_open $(srcdir)/stock_open.png \ diff --git a/gtk/stock-icons/stock_menu_sort_ascending.png b/gtk/stock-icons/stock_menu_sort_ascending.png new file mode 100644 index 0000000000000000000000000000000000000000..bfb9c0b8dab4f5e3ae5faf0c30ce686c5e279f5d GIT binary patch literal 302 zcmeAS@N?(olHy`uVBq!ia0vp^d_XL~!3HGNrubO_DYhhUcNd2LAh=-f^2tDv$DS^Z zAr-fhQxxR>xF;DKDRTaM{`~px^@~@3l=l_fq~<0ezii^e!^in~e*3*k`tV`9>Z!0D z$M)CP8^lyqOni9q_3g>FMdIkUguSq;w=8 zGWt-#QK$!8;-MT*v3=Hfgp1!W^ z7g?qG`L%crS3Cd;E%kJ945^rtoT9+@$6Y+(h-#xs`&9-tiN`bx&YrXkay+YsnY40O(={Pgg&ebxsLQ05q*&VE_OC delta 259 zcmV+e0sQ``0k$jV9mPsxuXO%t|IBczFufjEF+AONJePu((gjwAp8002ov JPDHLkV1g5cdIJCe diff --git a/gtk/stock-icons/stock_sort_ascending_16.png b/gtk/stock-icons/stock_sort_ascending_16.png new file mode 100644 index 0000000000000000000000000000000000000000..bfb9c0b8dab4f5e3ae5faf0c30ce686c5e279f5d GIT binary patch literal 302 zcmeAS@N?(olHy`uVBq!ia0vp^d_XL~!3HGNrubO_DYhhUcNd2LAh=-f^2tDv$DS^Z zAr-fhQxxR>xF;DKDRTaM{`~px^@~@3l=l_fq~<0ezii^e!^in~e*3*k`tV`9>Z!0D z$M)CP8^lyqOni9q_3g>FMdIkUguSq;w=8 zGWt-#QK$!8;-MT*v3=Hfgp1!W^ z7g?qG`L%crS3Cd;E%kJ945^rtoT9+@$6Y+(h-#xs`&9-tiN`bx&YrXkay+YsnY40O(={Pgg&ebxsLQ05q*&VE_OC delta 259 zcmV+e0sQ``0k$jV9mPsxuXO%t|IBczFufjEF+AONJePu((gjwAp8002ov JPDHLkV1g5cdIJCe -- 2.30.2